Merge changes from emacs-23 branch.
authorJuanma Barranquero <lekktu@gmail.com>
Mon, 11 Oct 2010 23:57:49 +0000 (01:57 +0200)
committerJuanma Barranquero <lekktu@gmail.com>
Mon, 11 Oct 2010 23:57:49 +0000 (01:57 +0200)
commitfbafdcaf1214fc800ab239f1d77958fed1b69289
tree0e8b15ae212d6698550e2e6194c30e88fffb91da
parentb8ce9fa90d28a100f169375557ce414be5119794
parentacae6da1cba7e582153c5255141c98e9471a01d8
Merge changes from emacs-23 branch.
12 files changed:
ChangeLog
doc/man/ChangeLog
doc/man/emacs.1
etc/NEWS.23
lisp/ChangeLog
lisp/cus-start.el
lisp/emacs-lisp/lisp.el
lisp/emacs-lisp/shadow.el
lisp/term/ns-win.el
make-dist
src/ChangeLog
src/nsterm.m